[Development] gerrit : using branches
edward.welbourne at theqtcompany.com
Wed Mar 30 20:55:12 CEST 2016
>>> That's pretty much exactly what
>>> $ git pull -r
>>> (a.k.a. --rebase) will do for you, automagically. It might not play
>>> ideally with merges in all cases, but I'm guessing you don't have a
>>> surfeit of those.
> Op 30/03/2016 om 19:09 schreef René J.V. Bertin:
>> I know, but as a matter of fact I do get merges and conflicts or
>> otherwise not cleanly applying patches a little too often, which tend
>> to leave my working copy in a state from which I know I haven't been
>> able to recuperate a few times too many.
and André Somers replied:
> Git reflog is your friend here. It can get you out of a tight spot in
> case of need.
... with a little help from git reset --hard as the way to get your
current branch and your working tree both back to somewhere you were
recently, that seemed like a better place than the mess you're now in.
More information about the Development