OutsideIT / FireMotD

:fire: Fire Framework Linux MoTD Generator :fire:
https://outsideit.net/firemotd
GNU General Public License v3.0
174 stars 45 forks source link

Dev #54

Closed willemdh closed 7 years ago

willemdh commented 7 years ago

I must be doing sth wrong as I get this everytime I create a pull request:

image

@ThomDietrich Any idea what I'm doing wrong here?

ThomDietrich commented 7 years ago

Probably because you've got conflicting branch changes. You need to make sure you always start a new branch from the latest master revision.

I'd recommend to use a GUI client for the beginning. SmartGit is definitely a good choice. Also this is quite helpful: https://de.atlassian.com/git/tutorials/setting-up-a-repository https://rogerdudler.github.io/git-guide/ http://alblue.bandlem.com/Tag/gtotw https://www.kernel.org/pub/software/scm/git/docs/giteveryday.html https://mrlunar.github.io/Git-Rolling-Release/ http://scottchacon.com/2011/08/31/github-flow.html http://www.creativebloq.com/web-design/choose-right-git-branching-strategy-121518344