search

wengxyu1030 / DHS-Recode-VII

1 stars 5 forks source link

Ys senegal2019 #10

Closed yining-sun closed 3 years ago

yining-sun commented 3 years ago

I followed the same approach that I used in Senegal2018. But it seems like the file cannot be automatically merged.

Let me know if there is any problems.

wengxyu1030 commented 3 years ago

There are conflicts when I try to merge the pull request to the master: image This is due to the branch you worked on is not synced with the master branch. Please use fetch and rebase function in GitHub desktop to avoid this. About rebase you can refer to this guide: https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/syncing-your-branch#:~:text=Force%20push%20origin.-,Use%20the%20Branch%20drop%2Ddown%20and%20click%20Rebase%20Current%20Branch,command%20line%2C%20or%20another%20tool.