search

BritishYouthBandAssociation / OrgAdmin

Admin site for organisations
1 stars 0 forks source link

Issue #212 and #213 branches merging together #265

Closed SJMartinn closed 1 year ago

SJMartinn commented 1 year ago

Fixing my mess

rugulous commented 1 year ago

Hey so... fun fact. You also don't need to do these as pull requests either!

This time, you can use git merge to do the trick

  1. Checkout the destination branch (git checkout Event-Membership-Filters)
  2. Merge in the source branch (git merge Event-Season-Filter)
  3. Deal with any conflicts/commit
  4. Push! (git push)