Skip to content

Conversation

@DelinWorks
Copy link
Contributor

Refer to #724

@halx99
Copy link
Collaborator

halx99 commented Jul 8, 2022

Your merge target branch is error, please close and recreate PR

@halx99 halx99 changed the base branch from release to dev July 8, 2022 14:15
@halx99
Copy link
Collaborator

halx99 commented Jul 8, 2022

Your merge target branch is error, please close and recreate PR

I modify for you, github is good

@halx99 halx99 added this to the 1.0 milestone Jul 8, 2022
@halx99
Copy link
Collaborator

halx99 commented Jul 8, 2022

But, you shouldn't use github webpage Fetch Upstream since github will fetch default branch which I modifiy from dev to release, the right way for seperate PR is create new branch from origin/dev

@halx99
Copy link
Collaborator

halx99 commented Jul 8, 2022

But, you shouldn't use github webpage Fetch Upstream since github will fetch default branch which I modifiy from dev to release, the right way for seperate PR is create new branch from origin/dev

This way, we can avoid many unnecessary commits histroy

Merge dev branch manually.
@DelinWorks
Copy link
Contributor Author

Your merge target branch is error, please close and recreate PR

How about now? I remerged the changes

@halx99
Copy link
Collaborator

halx99 commented Jul 8, 2022

This is the step by step to create new branch from upstream dev branch:

# Goto your local repo dir
cd axis
# add a remote name `official`
git remote add official https://github.com/axis-project/axis.git
# fetch remote `official`
git fetch official
# create new branch named `my-feature` from branch `official/dev`
git checkout -b my-feature official/dev

# do your modifications in branch `my-feature`

# commit and push your modifications branch my-feature to your own github repo
git add . && git commit -m "Example commit message"
git push origin my-feature

# Then you can goto upstream github webpage to create the PR with your plain branch `my-feature`

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants