4 ms·
obligatory xkcd: https://xkcd.com/1597/ https://xkcd.com/1597/ If anything is out of your few commands, just save work elsewhere, delete the project, and downl
by briffle 8y ago
obligatory xkcd: https://xkcd.com/1597/ https://xkcd.com/1597/
If anything is out of your few commands, just save work elsewhere, delete the project, and download a fresh copy.
- tracker1 8y agoI've, frankly, done that many times at this point... when your merge request gets too wonky, it's just easier. I do try to remember to squash, then rebase generally, though there are times I just forget or mess up.
- rconti 8y agoWhen in doubt, "how does the team here handle these conflicts? At my old job we just did <made up thing> to solve it, I've forgotten the process here."