Home

Workflow using forges (github/gitlab/codeberg)

  1. Start by creating a new project. Login to any forge and create a project.
  2. Clone the project using ssh (git@... url)
  3. create a new branch for feature/bugfix:
    $ git checkout -b feature/xyz
    
  4. Work, make changes, commit, push
  5. On push, you should get a link to create a PR like:
    remote: 
    remote: Create a new pull request for 'bugfix':
    remote:   https://example.org/user/example-project/compare/master...bugfix
    remote:
    
  6. Visit this link, add a title and description and click 'Create PR'
  7. Another person on your team should verify the PR, then click on 'Merge PR'
  8. If there are any merge conflicts, they should be resolved before merging. Do this on your own machine, not the web interface.

    Merge Conflicts are nothing scary, just look for lines starting with <<<<< and >>>>>
    Then chose the lines you want, delete ones you don't want.