Please help me about map procedures
-
modules:composer.user_said_in, @Schulz, Please help me about map procedures
It also says about my master branch: "This branch is even with main".
On this page, there should be an option to make master the default.
https://github.com/triplea-maps/aggression_1941/branches -
-
@Schulz hmmm, I bet getting it into TripleA maps collection made you give up ownership of that fork. Someone in the triplea maps team will probably have to make that change.
I think maybe @LaFayette or maybe @Trevan can do that? -
@Schulz , you are navalland2? You have write access to the agression1941 repo.
-
@Schulz said in Please help me about map procedures:
I guess eveything should be deleted in main branch
Why?
If you have all the work you want in 'main', do a pull request from 'main' to 'master' and the changes in 'main' will then be merged into 'master' (deletes, updates, or additions).
Typically you do not need to mess with other branches, just work on master directly.
-
Yes, I'am Navalland2.
Currently, there are files in both main and master branches If I have to exactly the same file structure with other maps then I have to delete all files in the main since the other maps have only one branch (master) which contains all files.
Now I just managed to make master the main branch.
-
@Schulz you only really want one branch, the second one is not doing anything for you other than acting as a staging, and the content is not going to be accessible. The file contents of the two branches can and may be different. If 'main' has the content you want, it sounds like you need to merge it into 'master'.
-
@LaFayette Yes, it would be great if I will be able to merge them. Even without it I'm glad to learn that main branch has no purpose since I can just bypass deleting files in this branch and just put all things in master.
-
-
@Schulz said in Please help me about map procedures:
@LaFayette Yes, it would be great if I will be able to merge them. Even without it I'm glad to learn that main branch has no purpose since I can just bypass deleting files in this branch and just put all things in master.
Once you get master updated, you can just delete main branch.
-
-
@Schulz said in Please help me about map procedures:
This screen usually just lets me delete an entire branch. Might be different for this, but i am pretty sure he said you have write permission.
-
@ff03k64
I am seeing "https://github.com/triplea-maps/aggression_1941/branches" as;
-
I've merged through the recent pull request;
-
@Schulz You said you have master current right? There is a garbage can to the right of where it says open. That should just delete the whole branch, and if you have it all updated to master, you should be good to go.
-
@ff03k64 Finally! Thank you so much, now there is only one branch which is master.
-
Although the same conflict still present in yaml files;
-
On the pull request page, there is a 'resolve conflict' button. It'll take you into a file editor window, just then fix up the file so that it reads correctly (so remove the
<<<<marks and double check that the image link is valid). Once you're done you should be able to save & have the conflict removed. -
Uh, no again....
-
The command ".travis/stages/verify/check-links-and-yaml-syntax/run" failed. Retrying, 3 of 3.
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login