Skip to content
Snippets Groups Projects

addition of advice, second try

Merged Henrik Jochum requested to merge (removed):master into master

Merge request reports

Merged by Danny McDonaldDanny McDonald 5 years ago (Mar 17, 2020 1:17pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Looks fine by me, notice this message:

    The source branch is 6 commits behind the target branch

    That's because stuff has happened on lit/digizeit that you don't yet have on your fork. This doesn't cause any conflict though, because nobody has touched the same files over there as you have in this request. But other times, you might have to bring your fork up to date with the origin before you could get the merge request to work (a situation known as a merge conflict).

  • Danny McDonald mentioned in commit 6144dde3

    mentioned in commit 6144dde3

Please register or sign in to reply
Loading