Why are my blueprints getting compile errors if I try to merge my branch with the master branch. They are working fine on my branch but after merging they are getting compile errors like can’t get self reference etc.
Presumably someone else also edited those blueprints, and the merged version of those blueprints isn’t valid.
Also, in general, you’ll want to “rebase” not “merge” when using git, but hopefully you’re already doing that.
2 Likes
Why use Git Rebase not merge? Doesn’t that remove knowledge about the branch history? Maybe sometimes it makes sense, but generally you wanna merge branches in order to be able to follow what happened, right?