Kevin Goslar

You can run `make fix` to fix the linter errors.

To help get this PR shipped, I have just shipped #5291. It provides a configuration setting for how lineage should be added to proposals. If this setting is set to...

It's `git config set git-town.proposals-show-lineage cli`, without "town".

Alright, merging this in. Thanks so much @Ydot19 for the hard work to get this pretty complex feature built and polished. You rock!

Thanks for coordinating on this. I’m currently focused on #5156 and a few other high-priority items, so I won’t be able to work on the feature you’ve built here for...

Git gives a pretty good explanation of the problem you encounter: ``` fatal: Unable to create '/Users/ryannystrom/Developer/campsite/.git/index.lock': File exists. Another git process seems to be running in this repository, e.g....

I'm not aware of any recent changes to Git Town that would cause it to run more Git commands under the hood. Maybe Android Studio had an update or configuration...

> that after I run into the lock contention and git-town fails during a sync, when I run `continue` my branch seems to revert changes on `main`. This sounds scary....

A key element to fixing this is reliably detecting whether Git fails because of concurrent access or because of a merge conflict. If anybody who runs into the concurrency issue...

Another way to reduce the occurrence of this problem could be to before running any Git command Git Town verifies that `/.git/index.lock` does not exist . If this file exists,...