document the merge-outside-your-talon-dir workflow

[rntz]

Merging with upstream knausj is useful for keeping up to date but sometimes difficult. For complex merges it's valuable to do it outside your .talon/user directory. Here's one workflow for doing this:

• Keep two local repos, say ~/knausj and ~/.talon/user/knausj. Have .talon/user/knausj set up with ~/knausj as its origin. Have ~/knausj set up with github.com/knausj85/knausj_talon as its origin.

• Have a branch in both repos for your local changes, called personal or similar. Keep ~/.talon/user/knausj permanently on the personal branch.

• To merge with upstream knausj: commit your local changes to the personal branch in .talon/user/knausj; push this branch into ~/knausj; pull main from github into ~/knausj; then merge main into your branch in ~/knausj (the messy step). Then pull the merged personal branch back into ~/.talon/user/knausj and check for errors/problems.

We should probably put something like this in the README.

[david-tejada]

What is the advantage of having the ~/knausj_talon repo? I only have the repo in talon/user with two remotes, one for my fork and one for upstream. When I want to bring in changes I pull from upstream and then I merge main into my personal branch

[rntz]

If you get a merge conflict in your .talon/user it results in your user config being messed up until you resolve it, which in the worst case might disable some commands you need to resolve the conflict!

On Wed, 12 Oct 2022, 14:25 David Tejada, @.***> wrote:

What is the advantage of having the ~/knausj_talon repo? I only have the repo in talon/user with two remotes, one for my fork and one for upstream. When I want to bring in changes I pull from upstream and then I merge main into my personal branch

— Reply to this email directly, view it on GitHub https://github.com/knausj85/knausj_talon/issues/1001#issuecomment-1276171571, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAAD6D2D3CU6IMY2A3RACN3WC235DANCNFSM6AAAAAARDHRLXY . You are receiving this because you authored the thread.Message ID: @.***>

[david-tejada]

Makes sense

[david-tejada]

This will probably make it easier to make changes for a PR. You would create a branch off of main in ~/knausj_talon, make the necessary changes and then pull from .talon/user/knausj_talon to check they work, right? I always struggle with this as when I switch to main all my personal changes are gone

[auscompgeek]

I would personally recommend using git worktree instead of a separate clone.

[david-tejada]

Oh my! That command looks super useful, thanks David!