Vanilla Code Questions

[wobbly]

You've done something funky. Some of the changes you're trying to pull in have been in master since September 2019

[DavidMedley]

Originally Posted by wobbly

You've done something funky. Some of the changes you're trying to pull in have been in master since September 2019

Hmm ok thanks for the tip.

[DavidMedley]

I guess I'll have to delete this and fork anew.

[DavidMedley]

I think I'm on the right track with github now. Question: is there a git setting to avoid updating a bunch of lines where the only change is my editor auto-trimmed some trailing whitespace?

[moosferatu]

If it's actually trimming spaces, you'll need to configure that in your editor.

What OS are you using? Windows? Most likely, it's converting line endings -- a highly irritating problem.

https://help.github.com/en/github/us...e-line-endings

[DavidMedley]

It's not the newlines, but thanks. It's the odd extra space or tab.

[Nick]

Here is my recommendation for managing your own version of the angband git repository:

1. Fork the official repo (angband/angband) using the fork button on github
2. Clone/download this to get your own local copy
3. Keep your master branch up-to-date with the official master branch, do not do development work on your master branch
4. For development work, create a branch and do your work there. Once it's ready for inclusion, push it to your github repo and make a pull request
5. The official master branch will be updated frequently. Make sure that you (fairly frequently):
   • Pull changes from the official repo and update your master (it should be just a fast-forward, since you are not developing on your master);
   • Rebase your development branch or branches against your master branch, resolving any conflicts that arise

This is how I work, and it should keep confusion to a minimum.

[DavidMedley]

OK, good tips. I know less about version control than I probably should.

[DavidMedley]

I got my changes into a new branch, rolled my master back (via CLI couldn't find this option on github), and can now pull in the 13 commits at the press of a button. Github gives me 3 choices for this:
- Create a merge commit
- Squash and merge
- Rebase and merge

Which do you recommend?

[Nick]

Originally Posted by DavidMedley

I got my changes into a new branch, rolled my master back (via CLI couldn't find this option on github), and can now pull in the 13 commits at the press of a button. Github gives me 3 choices for this:
- Create a merge commit
- Squash and merge
- Rebase and merge

Which do you recommend?

If you're pulling commits into your new branch from master and want to stay aligned with it, use rebase - that will bring your branch up to date with master, and then replay your new commits onto that base.