Search found 21 matches

by zecarlos1957
Thu May 23, 2019 9:59 am
Forum: Development Help
Topic: Something wrong with my remote repository
Replies: 4
Views: 1504

Re: Something wrong with my remote repository

I think I understand.
(resolving conflicts)
by zecarlos1957
Thu May 23, 2019 9:49 am
Forum: Development Help
Topic: Something wrong with my remote repository
Replies: 4
Views: 1504

Re: Something wrong with my remote repository

Jose@Jose-PC MINGW32 /d/Source/reactos/reactos/reactos (master|MERGING) $ git pull error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of...
by zecarlos1957
Thu May 23, 2019 9:28 am
Forum: Development Help
Topic: Something wrong with my remote repository
Replies: 4
Views: 1504

Re: Something wrong with my remote repository

Good morning, my dear friends.
Yesterday I typed <$ git fetch upstream>. this morning I have a bunch of files ready to commit. These are probably changes made by other contributors. Right?
What message should I write in this commit?
by zecarlos1957
Tue May 21, 2019 9:02 am
Forum: Development Help
Topic: Something wrong with my remote repository
Replies: 4
Views: 1504

Something wrong with my remote repository

It seems that only I have doubts !!! :roll: , the "Create Pull Request" button has been disabled, and where before it said "can do automatic merge", now says "can not do automatic merge". It happened in my last <git push origin master> where communication with the server was interrupted, and I had t...
by zecarlos1957
Sat May 18, 2019 3:13 pm
Forum: Development Help
Topic: learnng GIT for windows
Replies: 2
Views: 1249

learnng GIT for windows

I'm trying to create a new "Hello World" project to learn and train working with git. I created a ssh public key and inserted it into github, but when testing this key in git Bash with this command, I get the following message: $ ssh git@github.com PTY allocation request failed on channel 0 Hi zecar...
by zecarlos1957
Sun May 12, 2019 11:08 pm
Forum: Development Help
Topic: steps for a pull request
Replies: 2
Views: 1334

Re: steps for a pull request

Ok Fraizeraust.
I installed Git- 2.21.0 and TortoiseGit-2.8.0.0.
but for having many default settings windows that I do not understand, do not use yet. It's going to be my next class.
Thanks for the valuable info. A hug.
by zecarlos1957
Sun May 12, 2019 6:09 pm
Forum: Development Help
Topic: steps for a pull request
Replies: 2
Views: 1334

steps for a pull request

Okay. Step by step we'll get to the destination. I've created a branch at https://github.com/zecarlos1957/reactos/tree/Portuguese-translactions. After compiling and testing the desired changes in the virtualbox, i insert into this branch. But I want to put these changes into discussion and review wi...
by zecarlos1957
Sun May 12, 2019 1:28 am
Forum: Localization
Topic: recapping because I'm a bit confused.
Replies: 2
Views: 4269

Re: recapping because I'm a bit confused.

OK my friend. Thanks for the tip. I'm still trying to familiarize myself with github
by zecarlos1957
Sat May 11, 2019 11:06 pm
Forum: Localization
Topic: recapping because I'm a bit confused.
Replies: 2
Views: 4269

recapping because I'm a bit confused.

recapping because I'm a bit confused. I created a new branch in GitHub "zecarlos1957 / reactos" forked from "reactos / reactos" with the name "portuguese translactions. I made two new files with the names" pt-PT.h "and" pt-PT.rc "and made changes in the file "muilanguages.h", "en-BR.rc" and "syssetu...
by zecarlos1957
Wed Apr 24, 2019 11:42 pm
Forum: Development Help
Topic: help about jira
Replies: 4
Views: 1337

Re: help about jira

OK Karlexceed. Thanks for the answer.
I already know what Scrum and Kanban is
My goal is to put into practice knowledge acquired from C and C, applying them in this fantastic project that has everything needed to win. First I have to get acquainted with these processes that are new to me.
by zecarlos1957
Tue Apr 23, 2019 10:34 pm
Forum: Portuguese
Topic: Ajuda para o "jira"
Replies: 0
Views: 5280

Ajuda para o "jira"

Parece que entrou tudo de férias, desde Outubro de 2018 que ninguém tem duvidas!!!

OK bom dia a todos vós.

Alguém me poderia ajudar com o "jira"?
by zecarlos1957
Tue Apr 23, 2019 9:21 pm
Forum: Development Help
Topic: help about jira
Replies: 4
Views: 1337

help about jira

I'm trying to figure out how the jira works. In the help page it says: "Find your issue: Typically, your Development Manager will have already created a Scrum or Kanban project, and populated the backlog with issues. " Who is my development manager? What is a Scrum or Kanban project ??? Sorry for my...
by zecarlos1957
Tue Apr 23, 2019 9:24 am
Forum: Development Help
Topic: where is log lile
Replies: 1
Views: 1114

where is log lile

Good morning

I'm testing ReactOS (DEBUG) from the livecd in VirtualBox. Where can I find the log file?
by zecarlos1957
Sun Apr 21, 2019 3:33 pm
Forum: Development Help
Topic: Adding a folder to ReactOS file system
Replies: 1
Views: 1332

Adding a folder to ReactOS file system

How can I add a file folder to the file system of the ReactOS boot cd?
by zecarlos1957
Sun Apr 21, 2019 12:01 pm
Forum: Development Help
Topic: The Start menu modern
Replies: 6
Views: 1710

Re: The Start menu modern

OK friend. This is a way to understand how the code works. Trying to overcome difficulties. For now the biggest is on how to create the "CreateStartMenuModern" function.
Thanks for the quick response