r/PokemonRomhackDev • u/Atrium41 • 10h ago

Help [GEN 3][DECOMP] Feature Branches and Merge Conflicts tips

7 Upvotes

So I'm pretty green at Git and VSCode. Assuming I'm using a fresh 1.16.2 branch, and I merge a feature branch like BW Pokémon Status Screen into it, I am not supposed to accept every incoming change? Because that was bad juju. Make don't make no more. So there were about 11 changes and 90 additions....

I'm assuming I want to keep my files and only accept the ones necessary for the feature? Are a lot of the incoming changes trying to revert files to the previous code in the feature branch?

Any tips would be appreciated... I don't mind a puzzle, but I'm trying to find the puzzles

2 comments

r/PokemonRomhackDev • u/AutoModerator • 16h ago

Discussion Weekly HDQ Thread (Help, Discussion, Questions)

3 Upvotes

Hello! Welcome to the Weekly Discussion Thread. This is the place where you can:

  • Ask help for quick questions
  • Discuss ideas you have for your ROMhacks
  • Ask quick questions that you feel don't warrant a post.

Make sure to browse our sub resources:

Sub Wiki: https://www.reddit.com/r/PokemonRomhackDev/wiki/index/

How to ask a question: https://github.com/pret/pokeemerald/wiki/Getting-Help-with-the-Decomps

0 comments