Help me make my new variant! (please!)

[will_asher]

So I just finished merging a bunch of commits from newer V into my Rubberband branch on github. And now I can't sync with my code in Virtual Studio.

In order to use github desktop to cherry-pick commits, I had to change the name of my folder on github. (I changed it from "Rubberband" to "Rubberband-master") I figured changing my "source" in Visual Studio likewise would let it be able to sync the code, but it doesn't.
EDIT: Here's the message it gives me when trying to sync:
"Remote: Repository not found.
Git failed with a fatal error.
repository 'https://github.com/will2asher/RubberBand-master/' not found"

Can anyone help with this?

I posted my question on the github community forum as well:

https://github.community/t/syncing-with-virtual-studio-after-cherry-picking-with-github-desktop/191124

EDIT: Maybe I'll just have to re-clone the source from git.

[will_asher]

Will--
You dont need to accept all changes in V if you dont want them--in fact you almost certainly dont. What you will want is bug fixes. You can find those by browsing the log.
Finally, there are tutorials on how to merge changes from two different branches, and how to pick changes for merging. Or you can just ignore V changes going forward. The point is to have a source control for your own code.

Yeah. I think I'll just look for the changes with bugfixes.

[Pete Mack]

... and by far the hardest part is merging conflicts. (Merging branches is harder, but really rare.)

[Julian]

Well, Pete made it sound like using git would make getting changes from newer V relatively easy.

It’s all relative. Without git, it’d be a nightmare.

But it's still turning out to be a huge pain. Is there any way to make this less trouble?

Just practice and learning the tools, I’m afraid.

Github is not very user friendly to casual hackers like me.

Git is, to be frank, not a friendly tool. Github and gui front-ends make it somewhat easier, but even if the open-source world had settled on Mercurial instead, there’s only so much easier things can get; what is being done is fundamentally complicated and extremely hard to automate.

[Pete Mack]

Will--
You dont need to accept all changes in V if you dont want them--in fact you almost certainly dont. What you will want is bug fixes. You can find those by browsing the log.
Finally, there are tutorials on how to merge changes from two different branches, and how to pick changes for merging. Or you can just ignore V changes going forward. The point is to have a source control for your own code.

[will_asher]

Well, Pete made it sound like using git would make getting changes from newer V relatively easy. But it's still turning out to be a huge pain. Is there any way to make this less trouble? or maybe I won't bother trying to keep up with changes in V.
Maybe I should've gone back to a more stable version to base my variant on (or waited for a more stable future version).

Github is not very user friendly to casual hackers like me.

[wobbly]

What he said. You should be able to ask git to tell you what commit 6c45e566d was (I don’t recall how, because I’m not good with git), but unless it’s directly affecting things you’re changing, I’m of the opinion that you should keep up with the mainline changes; they’re doing a lot of bug-fixing and infrastructure work.

I'm asuming its this:

https://github.com/angband/angband/commit/6c45e566d

[Julian]

From what you wrote before, it looks like your version (the first part marked HEAD up to the "========") has code with some local changes that was removed (or in the case of this particular change, likely moved to a different file) in Vanilla Angband.

As for resolving the conflict, that'll depend on whether Vanilla moved stuff or completely removed it. Looking at what the changes were in Vanilla should help clarify that. For this, I'm guessing it's code that was moved from wiz-debug.c to cmd-wizard.c. If that's the case, you would want to determine whether to transfer what you had changed to its new location or completely reject Vanilla's rearrangement of the code.

What he said. You should be able to ask git to tell you what commit 6c45e566d was (I don’t recall how, because I’m not good with git), but unless it’s directly affecting things you’re changing, I’m of the opinion that you should keep up with the mainline changes; they’re doing a lot of bug-fixing and infrastructure work.

[backwardsEric]

But it just marks the beginning and end. It doesn't say what I need to change in between those markers for it to be resolved. How do I know what needs to be changed? (The diff isn't showing any changes in between the markers.)

From what you wrote before, it looks like your version (the first part marked HEAD up to the "========") has code with some local changes that was removed (or in the case of this particular change, likely moved to a different file) in Vanilla Angband.

As for resolving the conflict, that'll depend on whether Vanilla moved stuff or completely removed it. Looking at what the changes were in Vanilla should help clarify that. For this, I'm guessing it's code that was moved from wiz-debug.c to cmd-wizard.c. If that's the case, you would want to determine whether to transfer what you had changed to its new location or completely reject Vanilla's rearrangement of the code.

[will_asher]

That’s a merge conflict to resolve

But it just marks the beginning and end. It doesn't say what I need to change in between those markers for it to be resolved. How do I know what needs to be changed? (The diff isn't showing any changes in between the markers.)

[Julian]

Working on merging in the recent commits from V and resolving differences.
What does this mean in the code:

"<<<<<<< HEAD"
...
"=======
>>>>>>> 6c45e566d (Use Angband 4 command system for debugging commands (#4676))"

I've never seen it in C before.
EDIT: To me it looks like a temporary note that should be deleted before trying to run the program, but I want to make sure.

That’s a merge conflict to resolve

[will_asher]

Working on merging in the recent commits from V and resolving differences.
What does this mean in the code:

"<<<<<<< HEAD"
...
"=======
>>>>>>> 6c45e566d (Use Angband 4 command system for debugging commands (#4676))"

I've never seen it in C before.
EDIT: To me it looks like a temporary note that should be deleted before trying to run the program, but I want to make sure.

[will_asher]

It's one of git's standard commands; documentation for it is here, https://git-scm.com/docs/git-cherry-pick .

If you're working with GitHub's "Desktop", there's supposedly a cherry-picking feature that's been added. A blog post mentioning that is here, https://github.blog/2021-03-30-githu...herry-picking/ .

I don't know if GitHub has something to do cherry picking from within it's web interface.

Thank you.

[backwardsEric]

So is git cherry-pick an additional app or add-on? How do I find it and how to use it?

It's one of git's standard commands; documentation for it is here, https://git-scm.com/docs/git-cherry-pick .

If you're working with GitHub's "Desktop", there's supposedly a cherry-picking feature that's been added. A blog post mentioning that is here, https://github.blog/2021-03-30-githu...herry-picking/ .

I don't know if GitHub has something to do cherry picking from within it's web interface.

[will_asher]

This is not completely straightforward. What I do for FAangband is to use git cherry-pick to pull individual git commits in. Another way is to use git rebase to take current V and then replay the changes you've made on top of it (note that this doesn't remove changes you don't want).

Sorry there isn't a simple answer - I see a bunch of learning about git in your future

So is git cherry-pick an additional app or add-on? How do I find it and how to use it?