Please help me about map procedures

[Schulz]

İs it good now?

[LaFayette]

Looks pretty okay, I have not looked in detail. Note there is a 'download zip' button available so you can double check:

[Schulz]

Also a conflict happened in this part when I changed yaml files;

<<<<<<< patch-2
img: https://user-images.githubusercontent.com/72459062/99464069-4bbd1880-2948-11eb-925e-d6145fe34070.png

master

Is it because the image address should have started with "raw" or because of high resolution of the image? How could I solve it?

Thanks.

[Schulz]

LGTM analysis: Java is still failing after replacing it with way shrinked version.

[LaFayette]

It's a bit easier to keep the PR related comments in the PR. But FWIW, to find the link to a file, locate the file in your map repository: https://github.com/triplea-maps/aggression_1941

Once you've navigated and clicked through on the target file, click the "raw" button and then copy the URL from your browser window. You can double check by pasting that URL into a new browser window and you should see just the target image.

For the conflict, you'll need to click 'resolve conflict' and then update the file to look right.. I can help with that, first focus on uploading and locating a good preview image.

[Schulz]

Couldn't really someone to do on behalf of me? I just really tired of to deal with github stuffs.

[Schulz]

Ok. I just run out of my patience to github. It must be the most frustrating, pathetic, unnecessarily complex thing I've ever seen.

I won't bother with this anymore.

[ff03k64]

@Schulz I have been working on documentation for TripleA. Not for that specifically yet, but if you tell me what isn't clear, I can work on that next.

[Schulz]

@ff03k64 All files were in main branch not in master, but github does not allow mass deletings or mass updatings hence I choosed not bothering to delete these relief and base images one by one and uplaod them to master branch, even after that its no guarantee it would be sufficient.

And now master branch totally disappearad. Its just total mess right now don't think it can be fixed easily.

[ff03k64]

@Schulz I made a comment in your other thread, I have some ideas, not sure if they will work, but they are ideas. I think you should be able to make a new branch called master, and just make that the default branch.
https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository

[Schulz]

@ff03k64 I guess eveything should be deleted in main branch hence main one will disappear and master branch will remain like other maps. But no way to easily delete everythings in the main.

It also says about my master branch: "This branch is even with main".

[ff03k64]

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]

@ff03k64

[ff03k64]

@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?

[LaFayette]

@Schulz , you are navalland2? You have write access to the agression1941 repo.

[LaFayette]

@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.

[Schulz]

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.

[LaFayette]

@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'.

[Schulz]

@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]

---